removed weird commit merge stuff from scandd