version 0.3.7 is ready
fixing conflicts