New commit
Fixed merge conflicts