merge error fix commit 2