Issue 265 fixing conflicts