fixed some make errors
fixed weird merge error