merge error fix commit 4