fixed some wacked merge