Had more issues due to my merge mistake. Everything should be back on track now.