merge gefixed