Looks like you have some merge conflict code in here.