seems like this is showing all the changes I've pulled in from other branches. can you refresh from the mainline development branch and see if that fixes it?