Fix merge bs