fixed weird merge bug