Fixed merge error #whydoesthisalwayshappenonmasterbranch