set java version 7 for heroku
fixed broken test
added merge keyword