Upated :gem:
Updated gems
Conflicts resolved