fixed conflicts head merge to master

@sshihata @Malatawy15 @ahmadsoliman 
There was a mistake in Gemfile, fixed it. :wink: