stoping point
resolving merge conflict
adding chevrons, removing windows linebreaks