22.02.13, 00:19, manual merging, db management and minSdk restoring