Remove merge conflicts
Merge from master