local message -1
merged changes