commit after resolving all conflicts, new head after chowzas code