Ready for testing
Fixed merge conflict