update views user, users, main, index
resolve conflict