The only way to resolve the dev/funding arguing is to throw a New Year's Eve party, invite all parties, have lots of drinks and have a good time.