Implemented Task3
Conflit