edit answer
conflicts resolved