changed button name to Save
removed merge conflict files