Consolidate development into the Git repository