fixing conflicts and styles #116