hot fix for commit merge issue resolution