Fixing merges and some directory inconsistences