added messages controller and created merge file for messages