Fixed code
Fixed merge conflict