fixed context after merge