Removing conflicts due to incorrect rebase with master