Fixed apparent merge conflicts and coding style