move git conflict and update to master