adding javascript indentation
fix conflicts