merged conflicts in both files