#1 merge fix