fixed syntax to please travis
removed some merge files
removed white spaces, added new line at end of class