Conflict created from local repo