clean conflicts error