merge notequals to master