commit local changes
renamed file and solving merge conflicts