fixed masterpage merge conflict