fixed confilcts