confilcts fixed