Updated with new message
Fixed merge conficts