forcing a merge conflict
fixed conflict