update local changes to newremotefile
resolved confliect