Commented.
Git ignore updated.
Merge conflicts resolved