Removed merge conflict from screen-output files