Lynette Miles
Lynette Miles
It also looks like the conflict can be resolved safely by accepting the incoming changes, but github has a bad habit of marking suggestions as outdated when you merge things...
This set of conflicts is due to added code samples. We may want to take some extra care here.
The conflicts were mostly due to formatting changes for style, I went ahead and fixed the conflicts in the interest of keeping things moving.
> Oh ! sorry guys i wasn't able to get to it yesterday, thanks for fixing it ! Not a problem! I'm the one who introduced a bunch of conflicts,...
fixed the merge conflict, made stylistic corrections, and approved.
> @esmerel can you please review and check on the conflicts? fixed!
I fixed the conflict and edited the single line that was changed.