initial code commit
resolving the conflict