recompited manifest file due to conflicts