- merge conflicts and check in conversion class