manually fix merging error