added more to the list, removed extra brackets
fixing conflict
fixing conflict