Fixing merge bs..