Conflicts Resolved on Merge

Introduced few images