misc
fixing merge conflict