trying to merge the branch