fixing merge issues
fixed more confilcts