Fixnig merge conflict