Prepare for task
Subfile
Merge pull request #7 from murdho/RBT-04-resolving-conflicts

Rbt 04 resolving conflicts