merge changes back into fork