fixing use strict requirement
fixing merge issues