Remove posible conflicts files + now forge 1230