Fixed fail merge