resolving conflicts to push JS tweak