reminder for me: kill these lines before merge