fix compose message
fix compose message
fix conflicts