Cleaned using localStorage
Resolved conflict
Still a little problem but it is quite alright