merge all changes made to date back into fresh fork