Wrong merged files commit