Medieval merge (35/48)

Medieval merge