error fixed
merged changes