No, i messed this up when creating the branch... if you merge this branch into the trunk, this won't overwrite your commits/code, will it?