fixed faulty merges