Fix code conflicts