i commit
fixed urls and views merge conflict