Bump to 1.2
Conflict resolved