merge bug gefixed