Fix conflict issues