Fixed minor merge conflict