strange stuff inserted when mergeing from main branch