dont upload conflict versions
Fixed conflict handling
Bumped version 1.2.7