Cleaning up extra build from merge error