merge working changes from original project repo