Fixing what broken in rebased-merge