merge final changes before hackmit deadline