local changes
chose remote change over the local one