Fix conflict merges