add file (but it wasnt me that added it which is weird?) rebase problem?