undoing part of merge
minor
basic function tampering detection
building