Trying to fix changes between origin and local