James change to allow for Non existing mark names, also small fix for empty manual mark for merges