Fix conflict properly