Refreshing the repo
Removing conflicts