Removed merge conflicts and started work on messaging feature.