Fix conflict merge