success after gem creation
conflicts merged