finally fixed dem manual git merges