Fixed odd merge bug