initial commit after merge