master commit
conflicts resolved
removed dummy messages