Trying to make a merge