angular formatting updated
fixed merge