removed some weird merge comment