Before save error fixed
Merge remote-tracking branch 'origin/master'
Saves working now