resolved table conflicts