add new message
remove conflicts again