Removing conflicts with master branch