fixed some improper merges