merging conflicts psg