resolving merge on gem lock
Merge on Gem Lock