make file merge errors