merge for conflicts