Fixed mistakes
Fixed merge conflict