Keep track of all uncommitted files
Keep track of all uncommitted files
fixed merge problems