Changing ID's and assiging a colour
Fixing merge conflicts