Fix conflict
Update gems