Preparing pull
Fixed merge conflict