fix for missing semicolon merge error