Commented both files and changed merge conflicts