merge error solves