Fixed conflicts
Bumped version 1.1.4