Remove incomplete parts
conflict resolution