fixing merge conflict, for real