finished fixing merge