Resolved confilcts and added modal to Index.html