Fix git merger error problem