Fixed error in conflic resolution