Added stomp gem and removed conflict in .lock file