merging remote tracking branch as well