House keeping
Resolved conflict