Login page fixed
conflict resolved