removed merge comment added from previous commit