Fixes merge conflicts and removes excess message