solved conflicts

solved conflicts