set thoughts to q
merge conflict