Fixing mess-up in merge