Merging code to staging