Adding changes post full run
Resolving conflicts