fixing more errors
fixed more merge conflicts