Finish merge fix