fixed merge. don"t forget to grunt!