Clear conflicts with master branch