Preparing to merge
Fixed merge conflict