Resovled merge conflict