Fixed merge conflicts with .java files by creating backup.