adding stuff
resolving conflicts