Attempted resolution of merge conflict