fix conflicts and revert js cs fixing