Cleaned up the bank
Resolved some conflicts yoooo