trimming text and formating file
resolving merge conflict