For real final stop creating merge errors