Tidy up merge issues