State of code following the merge described in FYP report