Trying to merge the commits again