Bug fixed
merged conflict