Removed errant header from merge conflict.