removed sublime files
resolved conflict