Made some modifications
Resolved conflict