Add back some deleted shit from conflicts

- should fix current errors. moar probs

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>