fixed alot of errors
fixed merge error