resolve my commit mess