Got rid of >>>>>HEAD>>>>>>

some weird bug of github adding lines to files when syncing is
problematic?
Merge branch 'master' of https://github.com/jmtyszka/ET