bump  to 1.0.3
fix conflicts and bump to 2.0.3