hopefully fixed merges