Re-removing hipchat directory after merge