bump version to 3.3.1-SNAPSHOT
Page manager package reverted to its original value
Resolve conflicts