removed some conlficts