debugging merge stuff for line aligner, safe commit day 2