New code commit

Resolving conflict of .git* files