Three Tables made
Fixed Conflicts
using theirs