Working on merging build rules