commit before merge
Commit after recompile