fixed additional conflicts