return those lines, merge with master and will now work