added quickcrete
fixed merge conflict