resolved rest of merge conflict