Resovled merge conflict in info file