Fixed error merge conflict - fixing master