merge conflict w/ my PR