Restore some changes that were overwritten
Make sure your local copy is up to date or you merge any changes since your edit before committing!!!