edited gem file
resolved conflicts