salarywages conflict merge