v 1.1.2

resolving conflict