INIT DEV 2029

Fixed merge conflicts and my database