Feature/merge fix