local changes would be overwritten..
conflicts fixed?