fix merging mistake