saving changes before commiting to server
trying to fix merge error