moved source to the directory where maven expects it
go to 1.0.1 instead of 1.1
fix conflict