de-uglified the code
Fixed merge conflict