remove supposedly troublesome method
merge conflict