Completed implementation of flight details 2 tables and mergeed after resolving conflicts