screwed up merge, but still nothing has improved