resolve conflict between build task and manual set build remain
resolve conflict between build task and manual set build remain

PaleNeutron/WarshipGrilsRobot,PaleNeutron/WarshipGrilsRobot,PaleNeutron/WarshipGrilsRobot