Fixed merge issue with git