merge error fix commit 3