Merged code and newest build