Re-added skip command after git conflicts