bump version to 3.3.1-SNAPSHOT
Resolve conflicts