merge fixing